merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 28 Dec 2011 04:29:55 +0000 (13:29 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 28 Dec 2011 04:29:55 +0000 (13:29 +0900)

Trivial merge